Applies only for apps targeting sdk version <= 22 Bug: http://b/21565766 Change-Id: If0bf2229dc1341e9ca09f9a05d0890515273d5a2 (cherry picked from commit 38c37d6705f420ecac4146c11d79bee6e0ca8a03)