Merge "Fix boundary condition for targetSDK gated changes" into rvc-dev am: 259d98b1dd

Change-Id: Ic9ee23861770880231293376b7cb8ea82a9ea8ed