Updates #4984 Signed-off-by: Andrew Dunham <[email protected]> Change-Id: Ib229eb40af36a80e6b0fd1dd0cabb07f0d50a7d1