Added on-demand advice output, 0.3-SNAPSHOT
Code cleanup
Change-Id: I5c3e68a863d9e8eaf8c9d58c82e9b585ef822394
(())

Change-Id: Idb3a101e3202c60fbcd934ead0872983edc4e575