Merge changes Iea55330d,I547319f2 am: 7369c92fbc
am: 6bf19f7c77

Change-Id: Ida793d41885e50956300d54605cf9844fbc49da0