Merge 0ff0af378d56c25b2d577d6dc6755d12ca8c731f on remote branch

Change-Id: If0683b29b7a0eb33888fef833fca7479f8572449