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

Change-Id: Id9f29e6a98ba298d8ad99bb5f0dca0ef83d23fa8