Merge "Merge changes from topic "am-793ae1d1-008c-4cc0-9717-ce9555544b26" into oc-dev am: 6df241a03e am: 030fa4ed74" into oc-dr1-dev-plus-aosp
am: 1aa9cdf865

Change-Id: I5126be58ee5d0458c0695087c0e3fa8bce8ecfb1