Merge changes Ib7daba9c,Ib692bff0 am: 75b7e58c47 am: 72dcf0a781 am: 3503f24fe4

Change-Id: I77cc4ef70bcad85d921496a8e307997973de43b4