Merge changes I0508b2cc,I3d6bbc36
am: 767cb900a1

Change-Id: I72a150e3220e249b2601d27606f42f47197e9a2a