No functional changes. Bug: 18186310 (cherry picked from commit 6abf624d)] Change-Id: I0acf52d8ee7fe2d4f44bc832cbe9fabe1782f03f