Merge changes I61fd754e,I71bdc5e2,I1371b9ca
am: c3d8566699

Change-Id: If48813484e016ec9001fbbae520aa208f0ab040c