Merge "Don't crash apps unfairly under FAS" into pi-dev
am: 7450f0c0b2

Change-Id: I6ebb5a5e53cd614c0111d556dde8930028c264f0