Bug: Issue 5181 Change-Id: Ib64248a285e8feca1fd8f18e825f302d09d252ed Signed-off-by: Edwin Kempin <ekempin@google.com>