Reason: Revisit and redesign in S
Bug: 147390517
Test: make
Change-Id: I0749492a5648dfa2fb83271f349a8370972f7032
Merged-In: I0749492a5648dfa2fb83271f349a8370972f7032
(cherry picked from commit 2d280f1bb4)
Reason: Revisit and redesign in S
Bug: 147390517
Test: make
Change-Id: I0749492a5648dfa2fb83271f349a8370972f7032
Merged-In: I0749492a5648dfa2fb83271f349a8370972f7032
(cherry picked from commit 2d280f1bb4)