Merge 3bfd94586d35760af48588aa82a4549984ec1fcf on remote branch

Change-Id: I9fbeb0bb3d250dc2c6d06ff06157dcc98de42002