Merge from AOSP

Change-Id: Ibb6386ef8d1e5aa4992d4b9dbeae4a259b917559