Merge a9c20882aee7ffcd56333b778ecade0276d0b682 on remote branch

Change-Id: I0d9b49587b580e6a078a20f9e9c43a6c06f292d7