Test: refactoring CL, all existent tests should pass bug:34919311 Change-Id: Ib2889667a5ab8a2aaba443458782bc163467f0ea
082a1721b5
3ac2be93a9
f12ae4bed7
791d02818a