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

Change-Id: I8d6ad1bcd2c41553ced95c9f59e8a35889d24edf