Merge changes Iffbd6261,Ic7382a61
am: 5d4f420c8c

Change-Id: I98be5447462869276018af250f0e64147eda7e60