b/28643184 This reverts commit 79ec6df771. Change-Id: I3de8a27e88a5a84825e914725259530b22756da0
79ec6df771