Merge changes from topic 'remove_bg_cgroup' am: e941c5fa41
am: 857e716f3e

Change-Id: Ic60ff334426dc5ab8ff08a2e054de59d50dfad5d