Snap for 6660490 from 6480d56127bc2240fc3bf0a58d51e32e230efe11 to sdk-release

Change-Id: Ideaf59b12cf5f8c28d08f3919d9733537d5ca0ff
tree: 53cbb227c7c5fd3352478ffa1703a2395edf8a54
  1. android-5.4/