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

* commit '3797ee96a76225fda7019eb05ca0de0be2efe6c9':
  Do not make ActivityContainer available to apps. DO NOT MERGE