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

* commit '4eedccebb7f4c3f9e2f1890f92bead4b9c2a9819':
  Do not make ActivityContainer available to apps. DO NOT MERGE