Merge changes from topic "am-94e14f41e8574276a2af86435adf0fd9" into pi-dev-plus-aosp
am: 76c035b211

Change-Id: Ie6042554af7063ffabfd8b265b990da4050ccede