Should bring honeycomb into parity with gingerbread changes. Change-Id: Ieb48a0e420d4c2981130f268aba9b24f4fe25b84