Merge "Count app launch correctly." into pi-dev am: 8b49b9f736
am: b86987fc05

Change-Id: I0f5226e1338395368da54d8b36bc48ea8701caf8