Merge 7403312b24fc3329b6e9269d96a6ef75b14d62e1 on remote branch

Change-Id: I1b0b61496f5b210369398a41e1b0d94fa4741733