Merge 9c51aa5586a6a361361349ab81d1e7f064ae3a79 on remote branch

Change-Id: Icbcfe42959ce9ef51f9544a25681c98495149b54