Merge changes I303549ae,Ia36e0d2e,Ibdea2961 am: 20610c3082 am: 24808cdee0

Change-Id: Ie4edb2496a9524ba95185274c48c803026cba2d3