Merge changes I15f6f5ec,I1be1d442 am: d3a912fe60
am: 0999fde8fb

Change-Id: I0af425c90a6444ac09d6fa7c7dddaa5dcac86bcb