Bug: 17559789 Change-Id: I1d4b1524028164d27ec4eadd3960b567148f2b84
Bug: 8954116 Change-Id: Ica27dbfc570643bb81e6cdf34cc7c796ea080d71