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