Bug: 136220871 Test: VTS Tests Change-Id: I338f16d72cd7b1ba60ddf812e4cb87a6011de752 Merged-In: I338f16d72cd7b1ba60ddf812e4cb87a6011de752 Signed-off-by: Harpreet \"Eli\" Sangha <eliptus@google.com>