Merge 84088254b41521a4db457759f8e69782b6dc7a04 on remote branch

Change-Id: I464955a09f75240ab02bb81d29b763da6fbbc2ec