[go: nahoru, domu]

Merge commit '352b8202607e49d57e057ceca083fcfd1c084ce1' into patch_branch

Change-Id: Ib9abdc4eef273c87e75832d4fb0c9f99ab81cb6f