Merge changes I96070426,I7db26f2c
am: 7ac1bb2782

Change-Id: I3a2dacc4a0b924123863696c8afcbd1508133630