Merge 18d9283e40353e7064f8e190e045e1d4d6bfe587 on remote branch

Change-Id: Ie897b532f6211f0dd8d3965ac29bcd2b9aee702f