Merge changes Iea270320,Ib9063185
am: 7a08c896dd

Change-Id: I79310d93c0deda377105b3fd50b630f8f62e7fa8