Merge changes from topic "SAM-B4S4" into stage-aosp-master

* changes:
  Fix signature file
  DO NOT MERGE - Merge pi-dev@5234907 into stage-aosp-master