Merge changes Ic9957cb3,If7ae257c
am: 8f3ed62422

Change-Id: I9653f1d2aed8cc652505d8ed582248cfe246d284