Bug: 27538943 Change-Id: I91fc2e9738dcfb7be061041b5e000b21e7684184 (cherry picked from commit f45eca1d) (cherry picked from commit e72e604b)