am fbbbfb09: am 4ce318bb: Merge "Add missing restorecon calls."

* commit 'fbbbfb09e48c1d6e40396c4ce5bbad49752366f3':
  Add missing restorecon calls.