Merge 9990d514f4116808baad6aab6511156cfc1c4981 on remote branch

Change-Id: Id520df7d66aa31f73f36425fff39a21c67355831