Merge b677f54d8b68df7ab2f16e16dbd378159009ff33 on remote branch

Change-Id: Ida8c638a73e946a5520ab1a10c1145eacfcd4757