Merge "Merge changes from topic "heads_up_redesign" into pi-dev am: db0e4f1d73" into pi-dev-plus-aosp
am: bcdd582db5

Change-Id: Ia7fbe8a8b6579a00e0fcdbb62c4d7d53c793d183