This CL needs to be reverted after the issue is fixed, as it clutters the code a lot. Bug: 17439581 Change-Id: I548fdd73bbcd6d6ce727901f9dcd9f3f7268db9d
This CL needs to be reverted after the issue is fixed, as it clutters the code a lot. Bug: 17439581 Change-Id: I548fdd73bbcd6d6ce727901f9dcd9f3f7268db9d