Merge c5a10a3bd232383170b46392d687e1c944963ec7 on remote branch

Change-Id: Iea5ac51d6854e46ea9efa77fc4ec78be493972b4