Merge commit '3f3ed24' into stage-aosp-master
am: e9b6029153

Change-Id: Ife13a5773b542f9af317296addb70d753e64f69b