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

Change-Id: I674a5e8e1587de842352deb41279b6ea32045b60