Merge "Added a debug flag to turn on the AOD animation" into pi-dev am: 8b418b00e3
am: f10a0c71c1

Change-Id: I8e0067b68f0c8641f3b4cf4f4929b532777d0430