Merge changes from topic "am-dfb2548770de4bb299490c765377bd11" into pi-dev-plus-aosp
am: 8c8f08642d

Change-Id: Ic99d3e8ecd9c41769e4694fa737d809c7c5fa01d