Merge commit '8237dd82' into manualmerge

Bug: 6923539

Skipping the change. We already fixed this in master and jb-mr2-dev
in sha: 2905e18b. A compatible change
was submitted to jb-dev (and so automerged to jb-mr1-dev). see sha
7918cf4e. The conflict occurs while
merging 8237dd82 which I thought was
DO NOT MERGE anyway.

Change-Id: If96e368d2e2cec98bc18069151a2ff861b53608f