a6a0949b1d
(cherrypick of 79a49c9857f3949fc13373eeb179f27b6ecdca81.) Change-Id: I7bb44fd1fe3ef2ddfc115247f328eccfceeb5352 Signed-off-by: Patrick Tjin <pattjin@google.com>