Credit: Jon Sawyer (cherry picked from commit 08fa9e7c) Change-Id: I5bc9bc8d639603cb37deecbd94e9dc15017d7c6a