This is a partial cherry-pick of the original commit. Signed-off-by: Mayank Rana <mrana@codeaurora.org> Signed-off-by: Jack Pham <jackp@codeaurora.org> Signed-off-by: Hemant Kumar <hemantk@codeaurora.org> Bug: 154275330 (cherry picked from commit 62523500193e11a8837d4c76ef4a42be2ca4ea0f) Signed-off-by: Saravana Kannan <saravanak@google.com> Change-Id: Ibd407f59deab4b5bd655a71f938f79cffe1a5021