am a94e4297: (-s ours) Merge "Do not make ActivityContainer available to apps....
am a94e4297: (-s ours) Merge "Do not make ActivityContainer available to apps. DO NOT MERGE" into lmp-mr1-dev
* commit 'a94e4297':
Do not make ActivityContainer available to apps. DO NOT MERGE