* commit '409db558b3f47ac28f1291d82bef15a07b2920c3': Cherry pick honeycomb-mr1 I064d4dba to I48ddc26d4f