Merge 5fec68bcb47877cf30bc8e237960daa279c31f47 on remote branch

Change-Id: I4a79bf523c93d6709cf15e28d37cedf6ce250f9f