Merge "Merge changes I21aaab57,Ie174f7ec am: d5441ca5c3" into stage-aosp-master