Merge changes Id8e065d8,Ib4dd2b78 am: 476129ef4f am: a52eac37fe
am: 56e6248b53

Change-Id: I941ac851509c66a8f4da175363768bd6035a6b4b