Merge 4cc717479a79fdce0430d0c7cdb3d31395331db5 on remote branch

Change-Id: Ia606ded90ea344e7b95fdffd7292c6dcc16a105f