Merge changes Ia9865c75,I47d9d53d,Idbe10c36 am: da1df963e6
am: 5418c966ae

Change-Id: If1bf801d383204fe17e8d997e9c930755a61bc6d