Merge changes Iffbd6261,Ic7382a61 am: 5d4f420c8c am: d7a1602b7f
am: 7dc01ad17a

Change-Id: I5a44cc539fbb9037b8a5b9752bfcb9d6163feaa0