Merge changes Icd51c4c7,I836ecb94 am: 3590eb09ef
am: b03f3c8ba2

Change-Id: I8cbd96fc305e8356addbe4211275296c3ce0be43