resolve merge conflicts of 98804031fb4692cd1987c31a6056eb3052538ac4 to stage-aosp-master
am: 4f73630dcd

Change-Id: Ie927f0960eb471e9de11f9514b9aca4b307dcc97