Test: unit test added Bug: 120635548 Change-Id: I825b1ce526944a20fe65705508ad180ece37492c Merged-In: I825b1ce526944a20fe65705508ad180ece37492c (cherry picked from commit 8e6f998300)
8e6f998300