Merge 4987a149a5c7f8bd2d1bba1b24659541a5589c44 on remote branch

Change-Id: Iec54b00afd0152413e9deb3a6d45fd9ec095249b