Merge changes from topic "am-56dd07c8eceb476bbfad59becddc1ba1" into oc-mr1-dev-plus-aosp
am: 33fc64360a

Change-Id: I37f0181e69f11c13e01a33f68f687c5810a4f865