Merge commit 'ecdc451ccf9e3f6fa4a89ec99f0f59b0a8080516' into stage-aosp-master
am: 41be8e99b3

Change-Id: I26082e05b90cb500c0ee552338bcb0dc5883d725