Partial revert of ag/5808503 due to comment #27 and #29 of bug below Fixes: 115639644 Test: builds Change-Id: I31911569523023aa47ea53c1ae92b1663f7abca4
Partial revert of ag/5808503 due to comment #27 and #29 of bug below Fixes: 115639644 Test: builds Change-Id: I31911569523023aa47ea53c1ae92b1663f7abca4