[automerger skipped] Merge "DO NOT MERGE: Allow to control behavior of...
[automerger skipped] Merge "DO NOT MERGE: Allow to control behavior of loadSafeLabel" into pi-dev am: c8b3e0b6
am: ae57b77a -s ours
Change-Id: I7f2e2d8c9dda25b74446161cab2917e4d8e280a2