Test: Tested manually on local builds Bug: 182813345, 181365922 Change-Id: I143b8df12f9ca65936f4871a7a8985ef9495b61e