Merge changes I7d394c66,I737d66e8 am: bc8433d582 am: c8ac6dca3b
am: e11a7961f6

Change-Id: Ia12a2530b202fd04c466e02406a244878d4b52e9