Merge 3dc153cdd48e699d82ef94c7815d4706e87853e1 on remote branch

Change-Id: Iea96e99cd8d49b12a78b4b69661a945332e9b3a0