Merge 4987a149a5c7f8bd2d1bba1b24659541a5589c44 on remote branch

Change-Id: Ibba9022f48aecb45eb181f6249ac020dfb354efe