[automerger] Merge commit 'e42038e5c7286a15a50dd1decfa1a579dbda8cd6' into HEAD am: 1ec4196300

Change-Id: I16d35492c1254579794d4398dee28dd556a1703d