Bug: 18642766 Change-Id: I10e4532904a3a8cac43bec7630b9a7a90c2424ba Signed-off-by: Patrick Tjin <pattjin@google.com>