Bug: 5062341 Change-Id: I93af8274e538009dd8f00d1cea782b62334e43f1 Signed-off-by: Mike Lockwood <lockwood@android.com>