Merge changes I06ccca30,Iee86b058
am: e6ae06e687

Change-Id: Ie3ee46a42b05b9bfda3eb5233fe57721635baed9