am bcc3b312: Merge "Adjust instruction sets for shared UID apps."

* commit 'bcc3b312b0662ae2f8b8444eaedd5f35fc75c411':
  Adjust instruction sets for shared UID apps.