Bug: 112535855 Change-Id: I0df5b461c2b55fe4467fad577afd0be08a912c32
mentioned in commit 87df5648
mentioned in commit 018cd1a4