Merge changes I937ac6ab,Ib94f78f7 am: fcb69b8543
am: fb7c2a88fd

Change-Id: Ic027d3ad1dd86a6562ccac7c0c873f6202664541