Merge b48649df9f7df3e1ec509adeb69ce16c8e19bd9e on remote branch

Change-Id: I1e75ff7826d7b672c7723f9cae5114b0b983df1b