This is a partial cherry-pick of just the header changes.
change-Id: Ib1e18a8d40301c553efe0919e11c89ad87d9cfca
Signed-off-by: Udipto Goswami <ugoswami@codeaurora.org>
Bug: 154275330
(cherry picked from commit b1caa8095292da59320a24ee5e9f470af2d0aad4)
Signed-off-by: Saravana Kannan <saravanak@google.com>