Merge changes from topic "am-77824143cfe54e8ebd083716dd4fb16f" into stage-aosp-master
am: 259ea052e8

Change-Id: I9f66f83c96be53f9b27aea8356c6ce2e0e8c1ec1