Merge changes I303549ae,Ia36e0d2e,Ibdea2961
am: 20610c3082

Change-Id: I821dda4d6ecab52392c57c2db889757fd34bf2ba