Merge 77bb9380886b1f1b3be8a3af429d0715671a442d on remote branch

Change-Id: Ifc39fd621bf9fb387821482494417f54cf65cd17