Merge changes I4a084367,Id4636dc1 am: f094ac2bba
am: cf6d48dc93

Change-Id: Iba65c8e11d370b79d95a1510a8be10c6d41edb3b