Snap for 4496165 from 35be18888f2c94b6b1a17774ea356ad2891de67e to pi-release

Change-Id: I36eea84b25eaff83413a130ee027b4e307862357
tree: 9ddfb66e9db0e0058e877085f13b6cd5a545787d
  1. darwin-x86/
  2. linux-x86/
  3. manifest.xml