Merge changes I7d3ba051,I2dc96535
am: 76b7919ca3

Change-Id: Id403ac9f47ff87b1b6d97cd46cdbed5caf9e565f