Bug: 21164174 This reverts commit d79778faf3. Change-Id: Ide6b2dc4c511a60bcdf22dd44369e3a9fa08d1af
d79778faf3