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

Change-Id: I55d7636c9266ac099cfab3e59eb083233d6c4847