Merge changes I152d81c7,Id70cdc48
am: 664a78845a

Change-Id: I683d42bf655fbd81e8efd61a44062611dedb80ca