Merge 279d7a1bda2d55f0609aa9c3d15e27abe2320f62 on remote branch

Change-Id: I55496ebf607094d70c0ed9594c96c820c8edf527