Should be merged along with I7d78958232089a9c5f4fa340aa6e1b2bf8e2c931 Bug: T189982 Change-Id: If175ec538827056d0ab9a3bdda6370e0fca6508d