Merge af2e1270a4eba3a76f4344a04887f9c92c520018 on remote branch

Change-Id: I8a936c1d19071ba5584bdf668401f3e06d3b081d