Merge changes Icd51c4c7,I836ecb94 am: 3590eb09ef am: b03f3c8ba2
am: 12e585e745

Change-Id: I33a47fa7425807ab0edebcd9f4a83443cbbf0ac5