Merge changes I15070e8f,I079237bb am: ed3ff65cd1

Change-Id: I31c836394670720c9093b117a7d2573c70888c6d