Merge changes Idf81f50b,I1d047d4a
am: e81c4797c3

Change-Id: I7993c7a298ce5f5d59bf59423c4efd73b5c57efe