Merge 34c8ca3383f276455a79fa14827433e8de1a3e33 on remote branch

Change-Id: I36fea73cdec3392f0afd5c6684e716abdac6d682