Test: N/A Bug: 141939605 Change-Id: Icd9ae23a74175a98f8495f71c85b69891d387df0
Test: N/A Bug: 140430299 Change-Id: Ibce843d4c206ccb7b2cb2bbc1d7d41c9b8fde3df