Merge 77d80f4d6092c9319ccf47d5c10c58dc43fbed22 on remote branch

Change-Id: I63a9f0857622166abfbb863588ab7fc3e685cb0f