Merge changes I06651995,I2f341cf7 am: 3e2fad1fba
am: f05643279b

Change-Id: I50340910aa9a8c8bf8aae6e75880f3b57b6f6271