Sync up with Root-Box phone.

Change-Id: Ia0e8a679829c9d9e8c6011b0e95f59d46412b424