Merge 479bb9c268eb0d34227eab1c391c86272c161844 on remote branch

Change-Id: Id0308c723f8da1dffa201d2d6c53d013e83c0279