Merge changes I1fb50fb6,I8b3fa817
am: 390194398b

Change-Id: Icc2bb8ae3e9c20f911485f1867ebe6fc815d4c74