Merge changes from topic "am-32df9c80b45e459abc307fb7f14e48f6" into oc-mr1-dev-plus-aosp
am: fbf18a16d8

Change-Id: I12434caa85f12a7b50b86811cec09b49ecc49753