Merge "Add overloaded API with activity options parameter" into rvc-dev am: 6fa3741f am: 7751a7d5 Change-Id: Ife01e6d435aa397cd6e4a105916bb0641c22d198