[automerger] Merge commit 'e42038e5c7286a15a50dd1decfa1a579dbda8cd6' into HEAD am: 1ec4196300 am: dba49298e2 am: b9348d12a8 am: 983ab59558 am: bd7625f2fe am: 2f21aace53 am: b789b06d45 am: b433798478 am: dd40ebdfc8

Change-Id: I566c4bda21ddeca428abf34b83dc9a93fb69ec18