Merge changes Ib7daba9c,Ib692bff0 am: 75b7e58c47

Change-Id: I3067f3dfa8a5d0167f27af5af768d303bccd5510