Merge b224e416509e3dc52aea4e0929f7967848a8673f on remote branch

Change-Id: I974579a9680b20d0380a105168a26267cf85a79e