Bug: 130846989 Bug: 130887841 Change-Id: Id4ffc88fac0e0d240f57ae517be088d6429170df Merged-In: Id4ffc88fac0e0d240f57ae517be088d6429170df
mentioned in commit 2523b12b