[automerger] Merge changes I90451c14,I9fb27a0a into pi-dev am: b91dd1d944 am: f000c614dc

Change-Id: If0984fc32694d47900095e278922834ddc36aa63