Merge "Remove workaround for a fixed bug." am: c4a167426f
am: af97853138

Change-Id: Ie2b0e61877bf782fe56ab05099389577ecb711ab