Merge changes I6437dc95,I77261381
am: d9f506fd47

Change-Id: Ib3af51d0e71015bbc60f39bf209517b749bd80c0