Merge "Immediately report drawing" into oc-dev am: ba21a120c1
am: 46ccc64f72

Change-Id: Iea70deb7afeccce902988a8bc881d66fdfcee942