0cc59dd303
Bug: 17623887 (cherry picked from commit 8cf61dab5f11ed5654a5760ab47cec0239caafe0) Change-Id: I91e66ca0c26f04b50308059f9c89d388d55f6e3a