Merge 7403312b24fc3329b6e9269d96a6ef75b14d62e1 on remote branch

Change-Id: I0743d92dc377294e2cecdb94a61a069bd723fc69