Merge changes I714163b4,I368d5ce2
am: 893c2a3fac

Change-Id: Idf6eda60243488723c534e1f00dde2a70a52efde