Merge "Merge commit 'e022ea98ee6029f9431d7c33704fea71f9fd527f' into manual_merge_e022ea9" into nyc-mr1-dev-plus-aosp
am: 862fbe0828

Change-Id: I731331a312d5825ec50ab991df3e767eb6763924