Merge 5fec68bcb47877cf30bc8e237960daa279c31f47 on remote branch

Change-Id: Idf5cecee9c6b7b4a77485b300843da19d889c296