Merge "Wait on frame work fences when frames are dropped am: 06e2e9cf am:...
Merge "Wait on frame work fences when frames are dropped am: 06e2e9cf am: 7a14f5ae" into nyc-mr1-dev-plus-aosp
am: 2a8df992
Change-Id: I3a7c3592828e9d04ff92c1443b7655ae6d17540a