Merge changes I47f1e487,I715a97ba,Idb424831
am: 0fd0f1e8a6

Change-Id: Ib42bd2b137003d3cfee9c2f23cb55bdb4913b482