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

Change-Id: Ib38c4093090a2b12d6fb29af20e59aaf1cfe9ae1