Merge changes Ie6c300e1,I391f1e69
am: d00ec44aa5

Change-Id: I056771bd34ce7246603715c9ba1aa12ee0fdc4f2