Bug: 17987996 Change-Id: Ia661e87877e52274a991ceb77bbed93b7e6218f2 (cherry picked from commit 629c7cc84d)
629c7cc84d