[automerger skipped] Merge changes I9350ec13,I809d9191,I235f727d,I1930f3ba am: a0c949d5de
am: cdca6b559c -s ours
am skip reason: SHA1 cdca6b559c skipped by user jmgao

Change-Id: I8cc1daed00857ef3da0e69054a10fcca3d31917e