Merge aa78ad37ba6cccc11ba9b383fecc9d51403d9e08 on remote branch

Change-Id: I853190015417e6f9ae123989f4980eb4bacaa950