Merge changes I9dbbf904,Iebc174ed
am: 06d8067975

Change-Id: I30176a7bd0992d3a038458c0ccbe3a7ba9ecc9f7