Merge 9d35d7ef476a6114fac031e3db36042b3aa5b79f on remote branch

Change-Id: I1d98a1451985f7114bf96df10075cc7476a37484