Same as bug 1538511, this also should be removed. Change-Id: I0ea57e6f8274ee29e66b6d4494cd3255c1999685