Merge changes Ie6c300e1,I391f1e69 am: d00ec44aa5
am: 9aa8a05453

Change-Id: I52621be64d3fb57a78247fca0c92869fc1df8afd