Merge changes I50927036,I7154058a
am: 1fe9bec25a

Change-Id: Ib2bec8b82da677dcb3c622f089427e16d3f62180