Bug: 20557050 (cherry picked from commit d38ec80b) Change-Id: I0fc35bace77b11181f06199c121bc4e246d02100