Merge b593d07ea6eca869d49c2f2620e6a734103f8350 on remote branch

Change-Id: Ib5b286024e1202370fc6dbb7465da6edb66e6cf0