Merge changes I16f8b7ec,I075bbf55
am: 024662a310

Change-Id: I3daa0b45d054b46623a0501589f924c767eb3326