Test: Sanity Bug: 130979270 Change-Id: I585ecafcf9996e24befec2dbe86465a1d5a0f030 Merged-In: I585ecafcf9996e24befec2dbe86465a1d5a0f030 (cherry picked from commit 3b354042)