Merge changes I0ad349f2,I0f528cf1 am: 27a091d4a1 am: 69482cc127
am: 89573b397d

Change-Id: Id087881d88f87e2b31a77aab6f818118c04c25c6