Merge changes Idde2f3b7,I5b25d334,I69db530e am: 0f13397eb3
am: f3ba8d1d74

Change-Id: I38e4beff83a45a0769b82dc6cfb847a6be6c6558