Snap for 4706961 from 61606b9c4f783fd206d2eafb4becff37620baf72 to pi-release

Change-Id: Ib84aa9aed5b0111f24207d3f04b729ef84af2fb7
tree: cb4eb17b6166c814aca678162b649e4747674571
  1. current/
  2. P/