am 5a1cec86: am 0c3052a6: am 4eedcceb: Merge "Merge commit \'83a63bac\' into manualmerge" into lmp-mr1-dev

* commit '5a1cec86cfb3f08fac06ed26fe81247c3415d3ca':
  Do not make ActivityContainer available to apps. DO NOT MERGE