Merge \\"Add launch power hint for activity launch end\\" into nyc-mr1-dev am: a4e2bf4712
am: 7bf837e652

Change-Id: Ie97f9acf378bb908e0fbd06ee8d67a90d0e5e807