Merge changes Icdaf1cf1,I80ba5adb,I8de912c1 am: 0db49f9f7c am: 61e508c3b9
am: d33c9de331

Change-Id: I8fa0b0da3ecc66e4753e7de6cdb4b1a12158d25d