Merge changes Ia9865c75,I47d9d53d,Idbe10c36
am: da1df963e6

Change-Id: I75fb2a070f4490414d268cefa3702fde13c01f91