Merge "AOD group notification style" into pi-dev
am: b0e503f96d

Change-Id: I03132d8cb4b16e4eec17dc70e2a5a1fcce170729