Bug: 18688119 Change-Id: Id60f82295cdbc45065be416c9828eae144b6799f (cherry picked from commit 57b37f61)