Merge 7c2cc5c28349733701e30d5131e8c194a333af12 on remote branch

Change-Id: I29ba1476dd04a28e962e75fdb84c7f18f6c70e9a