Originally from I4d6773a88ea2932982278127a3c96d38be54ddf5 - file has move to a different git project in master, so manually re-applied the diff that landed in klp-dev Change-Id: I813210bd6160ab71c7a4dff9c221db31d8cc305c