Merge changes I5775d732,I27673017 am: 719f925df0 am: da937cb1f8

Change-Id: If430cec5af68a53d23bc52c83fcc55a99ca7daa6