Merge "Fix null pointer exception when updating action bar shadow." into oc-mr1-dev am: 51fb9ad956
am: 7cdb94384f

Change-Id: Iae7f415054b1848a4c33d89e176f38fb942ded03