Merge d80b07a235d1797999c1e08635dfa2af5b2bd269 on remote branch

Change-Id: I76d672f0e838a5f66b2a8e06845d8530552b975b