Bug: 63905942 Test: mm Change-Id: Idfc5fbb14a226c2abc1cf1d56007eaca30ba63ee
mentioned in commit ca7bb676
mentioned in commit 080905f6