Bug: 129548613 Test: Manually tested. Change-Id: If1811b3a31b328c9e6445174f41ca6feb0032af2
mentioned in commit f3df2a9a
mentioned in commit ae0bbe28