Merge 77c9691f3a09c34a3f57e56a719a728f96a58755 on remote branch

Change-Id: I495841f2bdf101981df9f7a12ae752feee40b377