Merge 870c7923818f159dec714d6eb7d428b93bef6483 on remote branch

Change-Id: I9c8f579a188de7744f4f8d2d76c6a05fd024b408