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

Change-Id: I4fbfb7c0b2872a7a824b9c51d93de6f5003d5926