Bug: 160260102 Test: Unit test Change-Id: I38e9efc46e23fe1aafe65100bbc7f72eb200720f
587620cc62
7c7680f261